From 6cf78a12c1e179b2d5eef4f045e242ceae475709 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 14 Jan 2011 17:49:48 -0500 Subject: [PATCH] Move GtkTextTag docs inline --- docs/reference/gtk/tmpl/.gitignore | 1 + docs/reference/gtk/tmpl/gtktexttag.sgml | 498 ------------------------ gtk/gtkenums.h | 13 +- gtk/gtktextattributes.h | 8 + gtk/gtktexttag.c | 16 + 5 files changed, 37 insertions(+), 499 deletions(-) delete mode 100644 docs/reference/gtk/tmpl/gtktexttag.sgml diff --git a/docs/reference/gtk/tmpl/.gitignore b/docs/reference/gtk/tmpl/.gitignore index 1cea81d52d..2d8d06735a 100644 --- a/docs/reference/gtk/tmpl/.gitignore +++ b/docs/reference/gtk/tmpl/.gitignore @@ -67,6 +67,7 @@ gtkstatusbar.sgml gtkstyle.sgml gtktesting.sgml gtktextiter.sgml +gtktexttag.sgml gtktexttagtable.sgml gtktextview.sgml gtktoggleaction.sgml diff --git a/docs/reference/gtk/tmpl/gtktexttag.sgml b/docs/reference/gtk/tmpl/gtktexttag.sgml deleted file mode 100644 index 85203a04d9..0000000000 --- a/docs/reference/gtk/tmpl/gtktexttag.sgml +++ /dev/null @@ -1,498 +0,0 @@ - -GtkTextTag - - -A tag that can be applied to text in a GtkTextBuffer - - - -You may wish to begin by reading the text widget -conceptual overview which gives an overview of all the objects and data -types related to the text widget and how they work together. - - - -Tags should be in the #GtkTextTagTable for a given #GtkTextBuffer -before using them with that buffer. - - - -gtk_text_buffer_create_tag() is the best way to create tags. -See gtk-demo for numerous examples. - - - -The "invisible" property was not implemented for GTK+ 2.0. -It is working (with minor issues) since 2.8. - - - - - - - - - - - - - - - - - - - - - - - - -@texttag: the object which received the signal. -@arg1: -@event: -@arg2: -@Returns: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Describes a type of line wrapping. - - -@GTK_WRAP_NONE: do not wrap lines; just make the text area wider -@GTK_WRAP_CHAR: wrap text, breaking lines anywhere the cursor can - appear (between characters, usually - if you want to - be technical, between graphemes, see - pango_get_log_attrs()) -@GTK_WRAP_WORD: wrap text, breaking lines in between words -@GTK_WRAP_WORD_CHAR: wrap text, breaking lines in between words, or if - that is not enough, also between graphemes. - - - -Using #GtkTextAttributes directly should rarely be necessary. It's -primarily useful with gtk_text_iter_get_attributes(). As with most -GTK+ structs, the fields in this struct should only be read, never -modified directly. - - -@appearance: pointer to sub-struct containing certain attributes -@justification: -@direction: -@font: -@font_scale: -@left_margin: -@indent: -@right_margin: -@pixels_above_lines: -@pixels_below_lines: -@pixels_inside_wrap: -@tabs: -@wrap_mode: -@language: -@invisible: -@bg_full_height: -@editable: - - - - - - -@name: -@Returns: - - - - - - - -@tag: -@Returns: - - - - - - - -@tag: -@priority: - - - - - - - -@tag: -@event_object: -@event: -@iter: -@Returns: - - - - - - - -@bg_color: -@fg_color: -@rise: -@underline: -@strikethrough: -@draw_bg: -@inside_selection: -@is_text: - - - - - - -@void: -@Returns: - - - - - - - -@src: -@Returns: - - - - - - - -@src: -@dest: - - - - - - - -@values: - - - - - - - -@values: -@Returns: - - diff --git a/gtk/gtkenums.h b/gtk/gtkenums.h index e62e43e107..78ea40c98d 100644 --- a/gtk/gtkenums.h +++ b/gtk/gtkenums.h @@ -619,7 +619,18 @@ typedef enum GTK_WINDOW_POPUP } GtkWindowType; -/* Text wrap */ +/** + * GtkWrapMode: + * @GTK_WRAP_NONE: do not wrap lines; just make the text area wider + * @GTK_WRAP_CHAR: wrap text, breaking lines anywhere the cursor can + * appear (between characters, usually - if you want to be technical, + * between graphemes, see pango_get_log_attrs()) + * @GTK_WRAP_WORD: wrap text, breaking lines in between words + * @GTK_WRAP_WORD_CHAR: wrap text, breaking lines in between words, or if + * that is not enough, also between graphemes + * + * Describes a type of line wrapping. + */ typedef enum { GTK_WRAP_NONE, diff --git a/gtk/gtktextattributes.h b/gtk/gtktextattributes.h index 5d43676f18..aa7d6f8aa8 100644 --- a/gtk/gtktextattributes.h +++ b/gtk/gtktextattributes.h @@ -67,6 +67,14 @@ typedef struct _GtkTextAttributes GtkTextAttributes; typedef struct _GtkTextAppearance GtkTextAppearance; +/** + * GtkTextAttributes: + * + * Using #GtkTextAttributes directly should rarely be necessary. + * It's primarily useful with gtk_text_iter_get_attributes(). + * As with most GTK+ structs, the fields in this struct should only + * be read, never modified directly. + */ struct _GtkTextAppearance { /*< public >*/ diff --git a/gtk/gtktexttag.c b/gtk/gtktexttag.c index 9d9e788843..bae882638c 100644 --- a/gtk/gtktexttag.c +++ b/gtk/gtktexttag.c @@ -47,6 +47,22 @@ * */ +/** + * SECTION:GtkTextTag + * @Title: GtkTextTag + * @Short_description: A tag that can be applied to text in a GtkTextBuffer + * + * You may wish to begin by reading the text widget + * conceptual overview which gives an overview of all the objects and + * data types related to the text widget and how they work together. + * + * Tags should be in the #GtkTextTagTable for a given #GtkTextBuffer + * before using them with that buffer. + * + * gtk_text_buffer_create_tag() is the best way to create tags. + * See gtk3-demo for numerous examples. + */ + #include "config.h" #include -- 2.30.2